reduce overwritten of temporary test files and reduce removal of files from another...

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4348 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/testo.d/classic-2.test b/gpsbabel/testo.d/classic-2.test
index acc3430b65fdd104e428fbfcc03825779ecb6a0a..dbe03a2587f78979401663d6ed66282e801b3c6f 100644 (file)
--- a/gpsbabel/testo.d/classic-2.test
+++ b/gpsbabel/testo.d/classic-2.test
@@ -289,14 +289,12 @@ rm -f ${TMPDIR}/gdb-*
 gpsbabel -i gdb,via -f ${REFERENCE}/gdb-sample.gdb -o gpx -F ${TMPDIR}/gdb-sample.gpx
 compare ${REFERENCE}/gdb-sample.gpx ${TMPDIR}/gdb-sample.gpx
 gpsbabel -i gpx -f ${REFERENCE}/gdb-sample.gpx -o gdb,ver=1 -F ${TMPDIR}/gdb-sample.gdb
-gpsbabel -i gdb -f ${TMPDIR}/gdb-sample.gdb -o gpx -F ${TMPDIR}/gdb-sample.gpx
+gpsbabel -i gdb -f ${TMPDIR}/gdb-sample.gdb -o gpx -F ${TMPDIR}/gdb-sample_v2.gpx
 gpsbabel -i gdb,via -f ${REFERENCE}/gdb-sample-v3.gdb -o gpx -F ${TMPDIR}/gdb-sample_v3.gpx
 compare ${REFERENCE}/gdb-sample.gpx ${TMPDIR}/gdb-sample_v3.gpx
 #
 # Because of Garmin coordinates storage gpx is not good for this test
-# compare ${REFERENCE}/gdb-sample.gpx ${TMPDIR}/gdb-sample.gpx
-#
-# compare ${TMPDIR}/gdb-sample.gpx ${REFERENCE}/gdb-sample.gpx
+# compare ${REFERENCE}/gdb-sample.gpx ${TMPDIR}/gdb-sample_v2.gpx
 
 #
 # Vito Navigator II .smt tests

diff --git a/gpsbabel/testo.d/classic-3.test b/gpsbabel/testo.d/classic-3.test
index e2e7dc2339d2b8ee82c270e8afee4c43c0eebc12..02cf25a630533e2aa56efb42de6dac542bd0d474 100644 (file)
--- a/gpsbabel/testo.d/classic-3.test
+++ b/gpsbabel/testo.d/classic-3.test
@@ -104,7 +104,7 @@ compare ${REFERENCE}/wbt-200.gpx ${TMPDIR}/wbt-200.gpx2
 #
 # WBT-201 tests
 #
-rm -f ${TMPDIR}/wbt-200.*
+rm -f ${TMPDIR}/wbt-201.*
 gpsbabel -t -w -i wbt-bin -f ${REFERENCE}/wbt-201.tk1 -o gpx -F ${TMPDIR}/wbt-201.gpx
 # Remove the timestamp
 grep -v time <${TMPDIR}/wbt-201.gpx >${TMPDIR}/wbt-201.gpx2

diff --git a/gpsbabel/testo.d/igc.test b/gpsbabel/testo.d/igc.test
index a29add25c337df1d5a287290948b8af531f4f6d8..e5e92ee34f9ebb7d1f5b34ad56c5ff11f418d95a 100644 (file)
--- a/gpsbabel/testo.d/igc.test
+++ b/gpsbabel/testo.d/igc.test
@@ -18,12 +18,12 @@ sed '/^LXXXGenerated by GPSBabel Version/d' ${TMPDIR}/igc.out > ${TMPDIR}/igc_se
 compare ${REFERENCE}/igc1_3d.out ${TMPDIR}/igc_sed.out
 
 
-gpsbabel -i igc -f ${REFERENCE}/igc2.igc -o gpx -F ${TMPDIR}/igc.gpx
-compare ${REFERENCE}/igc2_gpx.out ${TMPDIR}/igc.gpx
+gpsbabel -i igc -f ${REFERENCE}/igc2.igc -o gpx -F ${TMPDIR}/igc2~igc.gpx
+compare ${REFERENCE}/igc2_gpx.out ${TMPDIR}/igc2~igc.gpx
 
-gpsbabel -i gpx -f ${TMPDIR}/igc.gpx -o igc -F ${TMPDIR}/igc.out
-sed '/^LXXXGenerated by GPSBabel Version/d' ${TMPDIR}/igc.out > ${TMPDIR}/igc_sed.out
-compare ${REFERENCE}/igc2_igc.out ${TMPDIR}/igc_sed.out
+gpsbabel -i gpx -f ${TMPDIR}/igc2~igc.gpx -o igc -F ${TMPDIR}/igc2~igc~gpx.out
+sed '/^LXXXGenerated by GPSBabel Version/d' ${TMPDIR}/igc2~igc~gpx.out > ${TMPDIR}/igc2~igc~gpx_sed.out
+compare ${REFERENCE}/igc2_igc.out ${TMPDIR}/igc2~igc~gpx_sed.out
 
-gpsbabel -i igc -f ${TMPDIR}/igc.out -o gpx -F ${TMPDIR}/igc.gpx
-compare ${REFERENCE}/igc2_gpx.out ${TMPDIR}/igc.gpx
+gpsbabel -i igc -f ${TMPDIR}/igc2~igc~gpx.out -o gpx -F ${TMPDIR}/igc2~igc~gpx~igc.gpx
+compare ${REFERENCE}/igc2_gpx.out ${TMPDIR}/igc2~igc~gpx~igc.gpx

diff --git a/gpsbabel/testo.d/motoactv.test b/gpsbabel/testo.d/motoactv.test
index 28ee5f32723adc8a0a3079307643a485bc1a4b93..18d898eba088fe2aa8e10aea3bbdfbd94fa9ab90 100644 (file)
--- a/gpsbabel/testo.d/motoactv.test
+++ b/gpsbabel/testo.d/motoactv.test
@@ -1,6 +1,6 @@
 
 rm -f ${TMPDIR}/motoactv.*
-gpsbabel -i motoactv -f ${REFERENCE}/track/motoactv.csv -o gpx -F ${TMPDIR}/lowranceusr4.gpx
-compare ${REFERENCE}/track/motoactv~gpx.gpx ${TMPDIR}/lowranceusr4.gpx
+gpsbabel -i motoactv -f ${REFERENCE}/track/motoactv.csv -o gpx -F ${TMPDIR}/motoactv~csv.gpx
+compare ${REFERENCE}/track/motoactv~gpx.gpx ${TMPDIR}/motoactv~csv.gpx
 
 

diff --git a/gpsbabel/testo.d/transform.test b/gpsbabel/testo.d/transform.test
index 10dc9ed745d8c87ee5a1f4a4f9b6a1889c36cf8b..77b8869818f41c2c8582e8addd6baa42ea08ab25 100644 (file)
--- a/gpsbabel/testo.d/transform.test
+++ b/gpsbabel/testo.d/transform.test
@@ -1,9 +1,11 @@
 #
 # Transformation filter (transform) tests
 #
-rm -f ${TMPDIR}/transform*
+rm -f ${TMPDIR}/transform-rte.gpx
 gpsbabel -i gpx -f ${REFERENCE}/expertgps.gpx -x nuketypes,routes,tracks -x transform,rte=wpt,del=y -o gpx,gpxver=1.1 -F ${TMPDIR}/transform-rte.gpx
 compare ${REFERENCE}/transform-rte.gpx ${TMPDIR}/transform-rte.gpx 
+
+rm -f ${TMPDIR}/transform-wpt.gpx
 gpsbabel -i gpx -f ${REFERENCE}/expertgps.gpx -x nuketypes,waypoints,tracks -x transform,wpt=rte,del=y -o gpx,gpxver=1.1 -F ${TMPDIR}/transform-wpt.gpx
 compare ${REFERENCE}/transform-wpt.gpx ${TMPDIR}/transform-wpt.gpx